merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 16 Aug 2012 12:25:17 +0000 (21:25 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 16 Aug 2012 12:25:17 +0000 (21:25 +0900)
commita5d97cf54641e36a406b371acc74c74fcf5fcca0
tree273c0f18161dd4c554843f06a8b8de5e22339d05
parent3cc95f9ecf4b8a14d783edfa2e9d2f7fbc83a77b
parent42e6252d0c48b53b65583cb3310713583ef29827
merge trunk